unlockDialog: better confirmation button label

If I click on "Not listed?" in the login screen, I come to a username
field with two buttons: "Cancel" and "Sign In".

Clicking on "Sign In" doesn't actually sign me in though - it takes me
to the login entry. It would be better to rename "Sign In" to "Next" for
the username stage, therefore.

Gdm emit a signal to ask a question or a secret, but we can not know if
this is the last authentication question, hence we only use "Sign In"
for secret questions which improve the situation a lot.

https://bugzilla.gnome.org/show_bug.cgi?id=687656

diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
index 601d891b153d5beaa00a62b7bbd4862cb499e139..192a564cb917f71e127cc3b33795c5f7acde394d 100644 (file)
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -905,7 +905,7 @@ const LoginDialog = new Lang.Class({
         return batch.run();
     },
 
-    _showPrompt: function() {
+    _showPrompt: function(forSecret) {
         let hold = new Batch.Hold();
 
         let cancelButtonInfo = { action: Lang.bind(this, this.cancel),
@@ -914,7 +914,7 @@ const LoginDialog = new Lang.Class({
         let okButtonInfo = { action: Lang.bind(this, function() {
                                          hold.release();
                                      }),
-                             label: C_("button", "Sign In"),
+                             label: forSecret ? C_("button", "Sign In") : _("Next"),
                              default: true };
         let buttons = [];
         if (!this._disableUserList || this._verifyingUser)
@@ -975,7 +975,9 @@ const LoginDialog = new Lang.Class({
         this._promptEntry.set_text('');
         this._promptEntry.clutter_text.set_password_char(passwordChar);
 
-        let tasks = [this._showPrompt,
+        let tasks = [function() {
+                         return this._showPrompt(!!passwordChar);
+                     },
 
                      function() {
                          let _text = this._promptEntry.get_text();